Doc tweaks

Added back mouse sensitivity to wxStaticText
Added code to widgets sample to test for sensitive wxStaticTexts

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/datetime.tex b/docs/latex/wx/datetime.tex
index 665275f07c42c7fc8e2f0c0e3247667396144992..00823a44b058c6776e996a3291780913718a0b2c 100644 (file)
--- a/docs/latex/wx/datetime.tex
+++ b/docs/latex/wx/datetime.tex
@@ -650,7 +650,8 @@ Same as \helpref{Set}{wxdatetimewxdatetimetime}
 
 \membersection{wxDateTime::wxDateTime}\label{wxdatetimewxdatetimedate}
 
 
 \membersection{wxDateTime::wxDateTime}\label{wxdatetimewxdatetimedate}
 

-\func{wxDateTime\&}{wxDateTime}{\param{wxDateTime\_t }{day}, \param{Month        }{month = Inv\_Month}, \param{wxDateTime\_t }{hour = 0}, \param{wxDateTime\_t }{minute = 0}, \param{wxDateTime\_t }{second = 0}, \param{wxDateTime\_t }{millisec = 0}}
+\func{wxDateTime\&}{wxDateTime}{\param{wxDateTime\_t }{day}, \param{Month }{month = Inv\_Month}, \param{int}{ Inv_Year}, 
+\param{wxDateTime\_t }{hour = 0}, \param{wxDateTime\_t }{minute = 0}, \param{wxDateTime\_t }{second = 0}, \param{wxDateTime\_t }{millisec = 0}}

 
 Same as \helpref{Set}{wxdatetimesetdate}
 
 
 Same as \helpref{Set}{wxdatetimesetdate}
 

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 33ee4e679e266a408f201769144d6c3b6e7df278..90d1f7f7a91d87f0258899fdb80d3056162e4785 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -3275,14 +3275,14 @@ Returns the number of seconds since local time 00:00:00 Jan 1st 1970.
 
 \membersection{::wxGetLocalTimeMillis}\label{wxgetlocaltimemillis}
 
 
 \membersection{::wxGetLocalTimeMillis}\label{wxgetlocaltimemillis}
 

-\func{wxLongLone}{wxGetLocalTimeMillis}{\void}
+\func{wxLongLong}{wxGetLocalTimeMillis}{\void}

 
 Returns the number of milliseconds since local time 00:00:00 Jan 1st 1970.
 
 \wxheading{See also}
 
 \helpref{wxDateTime::Now}{wxdatetimenow},\\
 
 Returns the number of milliseconds since local time 00:00:00 Jan 1st 1970.
 
 \wxheading{See also}
 
 \helpref{wxDateTime::Now}{wxdatetimenow},\\

-\helpref{wxLongLone}{wxlonglong}
+\helpref{wxLongLong}{wxlonglong}

 
 \wxheading{Include files}
 
 
 \wxheading{Include files}
 

diff --git a/docs/latex/wx/scrolwin.tex b/docs/latex/wx/scrolwin.tex
index f71a9789baf13914391f2013b9465d5930630c6a..15c5be4cc1c8ae8fc7544a9309b7687d2aadfe98 100644 (file)
--- a/docs/latex/wx/scrolwin.tex
+++ b/docs/latex/wx/scrolwin.tex
@@ -205,6 +205,37 @@ parameters and returns a tuple of values for xUnit and yUnit.}
 \perlnote{In wxPerl this method takes no parameters and returns a
 2-element list {\tt ( xUnit, yUnit )}.}
 
 \perlnote{In wxPerl this method takes no parameters and returns a
 2-element list {\tt ( xUnit, yUnit )}.}
 

+\membersection{wxScrolledWindow::GetViewStart}\label{wxscrolledwindowgetviewstart}
+
+\constfunc{void}{GetViewStart}{\param{int* }{x}, \param{int* }{ y}}
+
+Get the position at which the visible portion of the window starts.
+
+\wxheading{Parameters}
+
+\docparam{x}{Receives the first visible x position in scroll units.}
+
+\docparam{y}{Receives the first visible y position in scroll units.}
+
+\wxheading{Remarks}
+
+If either of the scrollbars is not at the home position, {\it x} and/or
+\rtfsp{\it y} will be greater than zero.  Combined with \helpref{wxWindow::GetClientSize}{wxwindowgetclientsize},
+the application can use this function to efficiently redraw only the
+visible portion of the window.  The positions are in logical scroll
+units, not pixels, so to convert to pixels you will have to multiply
+by the number of pixels per scroll increment.
+
+\wxheading{See also}
+
+\helpref{wxScrolledWindow::SetScrollbars}{wxscrolledwindowsetscrollbars}
+
+\pythonnote{The wxPython version of this methods accepts no
+parameters and returns a tuple of values for x and y.}
+
+\perlnote{In wxPerl this method takes no parameters and returns a
+2-element list {\tt ( x, y )}.}
+

 \membersection{wxScrolledWindow::GetVirtualSize}\label{wxscrolledwindowgetvirtualsize}
 
 \constfunc{void}{GetVirtualSize}{\param{int* }{x}, \param{int* }{y}}
 \membersection{wxScrolledWindow::GetVirtualSize}\label{wxscrolledwindowgetvirtualsize}
 
 \constfunc{void}{GetVirtualSize}{\param{int* }{x}, \param{int* }{y}}


@@ -376,34 +407,3 @@ parameter in SetScrollbars.
 Call this function to tell wxScrolledWindow to perform the actual scrolling on
 a different window (not on itself).
 
 Call this function to tell wxScrolledWindow to perform the actual scrolling on
 a different window (not on itself).
 

-\membersection{wxScrolledWindow::GetViewStart}\label{wxscrolledwindowgetviewstart}
-
-\constfunc{void}{GetViewStart}{\param{int* }{x}, \param{int* }{ y}}
-
-Get the position at which the visible portion of the window starts.
-
-\wxheading{Parameters}
-
-\docparam{x}{Receives the first visible x position in scroll units.}
-
-\docparam{y}{Receives the first visible y position in scroll units.}
-
-\wxheading{Remarks}
-
-If either of the scrollbars is not at the home position, {\it x} and/or
-\rtfsp{\it y} will be greater than zero.  Combined with \helpref{wxWindow::GetClientSize}{wxwindowgetclientsize},
-the application can use this function to efficiently redraw only the
-visible portion of the window.  The positions are in logical scroll
-units, not pixels, so to convert to pixels you will have to multiply
-by the number of pixels per scroll increment.
-
-\wxheading{See also}
-
-\helpref{wxScrolledWindow::SetScrollbars}{wxscrolledwindowsetscrollbars}
-
-\pythonnote{The wxPython version of this methods accepts no
-parameters and returns a tuple of values for x and y.}
-
-\perlnote{In wxPerl this method takes no parameters and returns a
-2-element list {\tt ( x, y )}.}
-

diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h
index 20c49b73a4f1e1e6db79adcb1d1db9bb78e6fa1b..29561640a939b20c8ecd93cd910f850b640f4c2b 100644 (file)
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -48,6 +48,7 @@ protected:
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
     virtual void DoSetSize(int x, int y, int w, int h,
                            int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;

+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };

diff --git a/samples/widgets/static.cpp b/samples/widgets/static.cpp
index 991f823d1916d758bdd2ac898fc52449ed42dd8c..7c230e1f9c3345d3d5398aba276de215f8402c75 100644 (file)
--- a/samples/widgets/static.cpp
+++ b/samples/widgets/static.cpp
@@ -73,6 +73,27 @@ enum
     StaticVAlign_Max
 };
 
     StaticVAlign_Max
 };
 

+class DerivedStaticText: public wxStaticText
+{
+public:
+    DerivedStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+        long style = 0):
+        wxStaticText(parent, id, label, pos, size, style)
+    {
+    }
+    void OnMouseEvent(wxMouseEvent& event)
+    {
+        if (event.LeftDown())
+            wxMessageBox(wxT("Clicked on static text"));
+    }
+DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(DerivedStaticText, wxStaticText)
+    EVT_MOUSE_EVENTS(DerivedStaticText::OnMouseEvent)
+END_EVENT_TABLE()
+

 // ----------------------------------------------------------------------------
 // StaticWidgetsPage
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // StaticWidgetsPage
 // ----------------------------------------------------------------------------


@@ -324,7 +345,7 @@ void StaticWidgetsPage::CreateStatic()
     m_sizerStatBox = new wxStaticBoxSizer(box, isVert ? wxHORIZONTAL
                                                       : wxVERTICAL);
 
     m_sizerStatBox = new wxStaticBoxSizer(box, isVert ? wxHORIZONTAL
                                                       : wxVERTICAL);
 

-    m_statText = new wxStaticText(this, -1, m_textLabel->GetValue(),
+    m_statText = new DerivedStaticText(this, -1, m_textLabel->GetValue(),

                                   wxDefaultPosition, wxDefaultSize,
                                   flagsText);
 
                                   wxDefaultPosition, wxDefaultSize,
                                   flagsText);
 

diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index 1c0810694c1ed5be5834f28b96fcdd23aa61e728..a7f9c58876fb82429d0ac1ab19bf1e1cb93df4ee 100644 (file)
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -170,4 +170,13 @@ bool wxStaticText::SetFont(const wxFont& font)
     return ret;
 }
 
     return ret;
 }
 

+long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+  // Ensure that static items get messages. Some controls don't like this
+  // message to be intercepted (e.g. RichEdit), hence the tests.
+  if (nMsg == WM_NCHITTEST)
+    return (long)HTCLIENT;
+
+  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
+}

 #endif // wxUSE_STATTEXT
 #endif // wxUSE_STATTEXT