fix a few typos

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

diff --git a/interface/wx/dcmemory.h b/interface/wx/dcmemory.h
index 1becbf0cda5bb93c62ad6ca9ac2450125a9d2bd9..0d21e5bb0bc585f4a5785a4d13f67f739d1a146e 100644 (file)
--- a/interface/wx/dcmemory.h
+++ b/interface/wx/dcmemory.h
@@ -50,7 +50,7 @@ public:
     /**
         Constructs a new memory device context.
 
-        Use the wxDC::Ok() member to test whether the constructor was
+        Use the wxDC::IsOk() member to test whether the constructor was
         successful in creating a usable device context. Don't forget to select
         a bitmap into the DC before drawing on it.
     */
@@ -59,7 +59,7 @@ public:
         Constructs a new memory device context and calls SelectObject() with
         the given bitmap.
 
-        Use the wxDC::Ok() member to test whether the constructor was
+        Use the wxDC::IsOk() member to test whether the constructor was
         successful in creating a usable device context.
     */
     wxMemoryDC(wxBitmap& bitmap);
@@ -74,7 +74,7 @@ public:
         @ref overview_refcount).
 
         Also, before using the updated bitmap data, make sure to select it out
-        of context first (for example by selecting wxNullBitmap into the device
+        of context first (for example by selecting ::wxNullBitmap into the device
         context).
 
         @see wxDC::DrawBitmap()
@@ -88,7 +88,7 @@ public:
         the bitmap to a window. For this purpose, you may find wxDC::DrawIcon()
         easier to use instead.
 
-        If the argument is wxNullBitmap (or some other uninitialised wxBitmap)
+        If the argument is ::wxNullBitmap (or some other uninitialised wxBitmap)
         the current bitmap is selected out of the device context, and the
         original bitmap restored, allowing the current bitmap to be destroyed
         safely.

diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index aad21cb39f08cdd45afb55af2fc2675fd655a7c0..f775d03f671d4354185594861d7b19e5c0530811 100644 (file)
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -35,6 +35,8 @@
 #include "wx/aboutdlg.h"
 #include "wx/artprov.h"
 #include "wx/colordlg.h"
+#include "wx/wfstream.h"
+
 #include "anitest.h"
 
 #if !wxUSE_ANIMATIONCTRL
@@ -109,8 +111,6 @@ bool MyApp::OnInit()
 // MyFrame
 // ---------------------------------------------------------------------------
 
-#include "wx/wfstream.h"
-
 // Define my frame constructor
 MyFrame::MyFrame(wxWindow *parent,
                  const wxWindowID id,

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 8a774ae6a037dcf31bf7cfbc6e491b32236deb10..81dacee807aaf6c9d0190062ffc6762b9425cfbc 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -153,7 +153,7 @@ wxAppConsoleBase::~wxAppConsoleBase()
 }
 
 // ----------------------------------------------------------------------------
-// initilization/cleanup
+// initialization/cleanup
 // ----------------------------------------------------------------------------
 
 bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)

diff --git a/src/common/evtloopcmn.cpp b/src/common/evtloopcmn.cpp
index f0ae34416a6c85f80087c7945406bee27cda72e6..29e2d7c4235340c05e4e8eb746ab49fd4cd52404 100644 (file)
--- a/src/common/evtloopcmn.cpp
+++ b/src/common/evtloopcmn.cpp
@@ -23,7 +23,7 @@
 #endif //WX_PRECOMP
 
 // ----------------------------------------------------------------------------
-// globals
+// wxEventLoopBase
 // ----------------------------------------------------------------------------
 
 wxEventLoopBase *wxEventLoopBase::ms_activeLoop = NULL;