Always define SIZEOF_WCHAR_T if it's not defined under Windows.

[wxWidgets.git] / include / wx / generic / stattextg.h

diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h
index 69ef8b08f6408dd6b887e5f73dd13f44c65d36d4..361c3dc0071643ae0fcb5378db51df933e10b978 100644 (file)
--- a/include/wx/generic/stattextg.h
+++ b/include/wx/generic/stattextg.h
@@ -3,7 +3,7 @@
 // Purpose:     wxGenericStaticText header
 // Author:      Marcin Wojdyr
 // Created:     2008-06-26
-// Id:          $Id:$
+// Id:          $Id$
 // Copyright:   Marcin Wojdyr
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -11,7 +11,13 @@
 #ifndef _WX_GENERIC_STATTEXTG_H_
 #define _WX_GENERIC_STATTEXTG_H_
 
+// prevent it from including the platform-specific wxStaticText declaration as
+// this is not going to compile if it derives from wxGenericStaticText defined
+// below (currently this is only the case in wxUniv but it could also happen
+// with other ports)
+#define wxNO_PORT_STATTEXT_INCLUDE
 #include "wx/stattext.h"
+#undef wxNO_PORT_STATTEXT_INCLUDE
 
 class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase
 {
@@ -38,20 +44,21 @@ public:
                 const wxString& name = wxStaticTextNameStr);
 
 
-    virtual wxSize DoGetBestClientSize() const;
-    virtual wxSize DoGetBestSize() const;
-
+    // overridden base class virtual methods
     virtual void SetLabel(const wxString& label);
     virtual bool SetFont(const wxFont &font);
 
+protected:
+    virtual wxSize DoGetBestClientSize() const;
+
     virtual wxString DoGetLabel() const { return m_label; }
     virtual void DoSetLabel(const wxString& label);
 
-protected:
-    void OnPaint(wxPaintEvent& event);
     void DoSetSize(int x, int y, int width, int height, int sizeFlags);
 
 private:
+    void OnPaint(wxPaintEvent& event);
+
     wxString m_label;
     int m_mnemonic;