Always use XPMs in this sample

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

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 934d7e81186971638f1ddf6c33eb6065ab028cbc..17ecf98ad00e8b032ce4ee43e8dedbee174dcde7 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h
 // Purpose:     wxStaticText class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.h
 // Purpose:     wxStaticText class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

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

 #pragma interface "stattext.h"
 #endif
 
 #pragma interface "stattext.h"
 #endif
 


@@ -20,7 +20,7 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:

-  inline wxStaticText() { }
+  inline wxStaticText() : m_label() { }

 
   inline wxStaticText(wxWindow *parent, wxWindowID id,
            const wxString& label,
 
   inline wxStaticText(wxWindow *parent, wxWindowID id,
            const wxString& label,


@@ -41,17 +41,19 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 
   // accessors
   void SetLabel( const wxString &str ) ;
 
   // accessors
   void SetLabel( const wxString &str ) ;

+  bool SetFont( const wxFont &font );
+

   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events
   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events

-  void DrawParagraph(wxDC &dc, wxString paragraph);
+  void DrawParagraph(wxDC &dc, wxString paragraph, int &y);

   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;
   virtual wxSize DoGetBestSize() const ;
   virtual bool AcceptsFocus() const { return FALSE; }
  private :
   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;
   virtual wxSize DoGetBestSize() const ;
   virtual bool AcceptsFocus() const { return FALSE; }
  private :

-       wxString        m_label ;
+     wxString    m_label ;

 
    DECLARE_EVENT_TABLE()
 };
 
    DECLARE_EVENT_TABLE()
 };