Let Cygwin be a Windows build for wxMSW and a unix build otherwise

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

diff --git a/include/wx/univ/stattext.h b/include/wx/univ/stattext.h
index 869b9960da8bc8f93e92b737a6494f00aa1b4059..95de78f9ef9c97e020b51b894e720eb429eef08d 100644 (file)
--- a/include/wx/univ/stattext.h
+++ b/include/wx/univ/stattext.h
@@ -6,26 +6,28 @@
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     14.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATTEXT_H_
 #define _WX_UNIV_STATTEXT_H_
 

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

     #pragma interface "univstattext.h"
 #endif
 
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:
     #pragma interface "univstattext.h"
 #endif
 
 class WXDLLEXPORT wxStaticText : public wxStaticTextBase
 {
 public:

+    wxStaticText() { }
+

     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {
     // usual ctor
     wxStaticText(wxWindow *parent,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize)
     {

-        Create(parent, -1, label, pos, size, 0, wxStaticTextNameStr);
+        Create(parent, wxID_ANY, label, pos, size, 0, wxStaticTextNameStr);

     }
 
     // full form
     }
 
     // full form


@@ -33,7 +35,7 @@ public:
                  wxWindowID id,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
                  wxWindowID id,
                  const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,

-                 const wxSize& size = wxDefaultSize, 
+                 const wxSize& size = wxDefaultSize,

                  long style = 0,
                  const wxString &name = wxStaticTextNameStr)
     {
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr)
     {


@@ -45,7 +47,7 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,

-                const wxSize &size = wxDefaultSize, 
+                const wxSize &size = wxDefaultSize,

                 long style = 0,
                 const wxString &name = wxStaticTextNameStr);
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr);
 


@@ -53,12 +55,16 @@ public:
 
     virtual void SetLabel(const wxString& label);
 
 
     virtual void SetLabel(const wxString& label);
 

+    virtual bool IsFocused() const { return false; }
+

 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;
 
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);
 protected:
     // calculate the optimal size for the label
     virtual wxSize DoGetBestClientSize() const;
 
     // draw the control
     virtual void DoDraw(wxControlRenderer *renderer);

+
+    DECLARE_ABSTRACT_CLASS(wxStaticText)

 };
 
 #endif // _WX_UNIV_STATTEXT_H_
 };
 
 #endif // _WX_UNIV_STATTEXT_H_