Revert the zoom direction on Ctrl-mouse wheel in wxStyledTextCtrl.

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

diff --git a/include/wx/generic/stattextg.h b/include/wx/generic/stattextg.h
index 02860ea951102e49533f5b79f0136cc06cb766b2..9df2cd912fa4ecb9528a8693c6d8388940b12813 100644 (file)
--- a/include/wx/generic/stattextg.h
+++ b/include/wx/generic/stattextg.h
@@ -22,7 +22,7 @@
 class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase
 {
 public:
 class WXDLLIMPEXP_CORE wxGenericStaticText : public wxStaticTextBase
 {
 public:

-    wxGenericStaticText() { }
+    wxGenericStaticText() { Init(); }

 
     wxGenericStaticText(wxWindow *parent,
                  wxWindowID id,
 
     wxGenericStaticText(wxWindow *parent,
                  wxWindowID id,


@@ -32,6 +32,8 @@ public:
                  long style = 0,
                  const wxString& name = wxStaticTextNameStr)
     {
                  long style = 0,
                  const wxString& name = wxStaticTextNameStr)
     {

+        Init();
+

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


@@ -43,24 +45,45 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 

+    virtual ~wxGenericStaticText();

 
 

-protected:
-    virtual wxSize DoGetBestClientSize() const;

 
 

+    // overridden base class virtual methods

     virtual void SetLabel(const wxString& label);
     virtual bool SetFont(const wxFont &font);
 
     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);
 
     void DoSetSize(int x, int y, int width, int height, int sizeFlags);
 
     virtual wxString DoGetLabel() const { return m_label; }
     virtual void DoSetLabel(const wxString& label);
 
     void DoSetSize(int x, int y, int width, int height, int sizeFlags);
 

+#if wxUSE_MARKUP
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP
+

 private:
 private:

+    void Init()
+    {
+#if wxUSE_MARKUP
+        m_markupText = NULL;
+#endif // wxUSE_MARKUP
+    }
+

     void OnPaint(wxPaintEvent& event);
 
     void OnPaint(wxPaintEvent& event);
 

+    void DoDrawLabel(wxDC& dc, const wxRect& rect);
+
+    // These fields are only used if m_markupText == NULL.

     wxString m_label;
     int m_mnemonic;
 
     wxString m_label;
     int m_mnemonic;
 

+#if wxUSE_MARKUP
+    class wxMarkupText *m_markupText;
+#endif // wxUSE_MARKUP
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGenericStaticText)
 };