handle volume part of the path correctly in wxFileName(path, name, ext) ctor

[wxWidgets.git] / include / wx / univ / radiobox.h

diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h
index 0b9a6c48c36109b70f3061810ee6d0a7d589d635..cb915c9a65ee704fca82afab824dc35803387121 100644 (file)
--- a/include/wx/univ/radiobox.h
+++ b/include/wx/univ/radiobox.h
@@ -6,13 +6,13 @@
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     11.09.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_RADIOBOX_H_
 #define _WX_UNIV_RADIOBOX_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_RADIOBOX_H_
 #define _WX_UNIV_RADIOBOX_H_
 

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

     #pragma interface "univradiobox.h"
 #endif
 
     #pragma interface "univradiobox.h"
 #endif
 


@@ -21,7 +21,7 @@ class WXDLLEXPORT wxRadioButton;
 #include "wx/statbox.h"
 #include "wx/dynarray.h"
 
 #include "wx/statbox.h"
 #include "wx/dynarray.h"
 

-WX_DEFINE_ARRAY(wxRadioButton *, wxArrayRadioButtons);
+WX_DEFINE_EXPORTED_ARRAY_PTR(wxRadioButton *, wxArrayRadioButtons);

 
 // ----------------------------------------------------------------------------
 // wxRadioBox: a box full of radio buttons
 
 // ----------------------------------------------------------------------------
 // wxRadioBox: a box full of radio buttons


@@ -50,6 +50,16 @@ public:
         (void)Create(parent, id, title, pos, size, n, choices,
                      majorDim, style, val, name);
     }
         (void)Create(parent, id, title, pos, size, n, choices,
                      majorDim, style, val, name);
     }

+    wxRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 0,
+               long style = wxRA_SPECIFY_COLS,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr);

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -61,6 +71,16 @@ public:
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
                 long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);

+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0,
+                long style = wxRA_SPECIFY_COLS,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);

 
     virtual ~wxRadioBox();
 
 
     virtual ~wxRadioBox();
 


@@ -75,15 +95,19 @@ public:
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
 
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
 

-    virtual void Enable(int n, bool enable = TRUE);
-    virtual void Show(int n, bool show = TRUE);
+    virtual void Enable(int n, bool enable = true);
+    virtual void Show(int n, bool show = true);

 
     // we also override the wxControl methods to avoid virtual function hiding
 
     // we also override the wxControl methods to avoid virtual function hiding

-    virtual bool Enable(bool enable = TRUE);
-    virtual bool Show(bool show = TRUE);
+    virtual bool Enable(bool enable = true);
+    virtual bool Show(bool show = true);

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

+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip( wxToolTip *tip );
+#endif // wxUSE_TOOLTIPS
+

     // wxUniversal-only methods
 
     // another Append() version
     // wxUniversal-only methods
 
     // another Append() version