correct closing comments in #endifs (patch 1756990)

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

diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h
index ee5e719c2de82cd9c6c8f5d41d3e74e42cfcf481..ca9914f1aa4b2ae941f8618cc5c8d4e56d543306 100644 (file)
--- a/include/wx/anidecod.h
+++ b/include/wx/anidecod.h
@@ -72,6 +72,6 @@ private:
 };
 
 
 };
 
 

-#endif  // wxUSE_STREAM && wxUSE_ICO_CUR
+#endif  // wxUSE_STREAMS && wxUSE_ICO_CUR

 
 #endif  // _WX_ANIDECOD_H
 
 #endif  // _WX_ANIDECOD_H

diff --git a/include/wx/animdecod.h b/include/wx/animdecod.h
index 2194643578875c046b5619870acbb6ae38c8f7c2..0af04918167d4e62a6bf8f58def4223f06295b06 100644 (file)
--- a/include/wx/animdecod.h
+++ b/include/wx/animdecod.h
@@ -141,6 +141,6 @@ protected:
 };
 
 
 };
 
 

-#endif  // wxUSE_STREAM
+#endif  // wxUSE_STREAMS

 #endif  // _WX_ANIMDECOD_H
 
 #endif  // _WX_ANIMDECOD_H
 

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index f1a754a22775abc078442c56077c335e81ffb797..fcdf76d5fcdbea17179adaf59b317161c3538f0e 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -105,6 +105,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxGIFDecoder)
 };
 
     DECLARE_NO_COPY_CLASS(wxGIFDecoder)
 };
 

-#endif // wxUSE_STREAM && wxUSE_GIF
+#endif // wxUSE_STREAMS && wxUSE_GIF

 
 #endif // _WX_GIFDECOD_H_
 
 #endif // _WX_GIFDECOD_H_

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index e728d1b88597aafd1806921cb4db835fce9474f0..f8dcb43e856f1a4155a19d2e8fbda1178e3aea75 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -205,7 +205,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
     return m_impl->ChangeMode(mode);
 }
 
     return m_impl->ChangeMode(mode);
 }
 

-#endif // wxUSE_DIRECTDRAW
+#endif // wxUSE_DISPLAY

 
 // ----------------------------------------------------------------------------
 // static functions implementation
 
 // ----------------------------------------------------------------------------
 // static functions implementation

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 7cd583b699578c7a48428a821c8fa8ec9c6f6164..68adf5fb90d0c13f984662ad7aa64b932f84ac0e 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -384,7 +384,7 @@ void wxFrame::GtkOnSize()
                 yy = GetClientSize().y;
 #if wxUSE_MENUS_NATIVE
                 yy += m_menuBarHeight;
                 yy = GetClientSize().y;
 #if wxUSE_MENUS_NATIVE
                 yy += m_menuBarHeight;

-#endif // wxUSE_MENU_NATIVE
+#endif // wxUSE_MENUS_NATIVE

                 m_frameToolBar->m_x = xx;
                 m_frameToolBar->m_y = yy;
                 ww = m_width - 2*m_miniEdge;
                 m_frameToolBar->m_x = xx;
                 m_frameToolBar->m_y = yy;
                 ww = m_width - 2*m_miniEdge;

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 84590d5759d858f050f8841c8698a6af3a863db0..6c57967a5f8e2c5238a41f02e372da7099018680 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -183,14 +183,14 @@ void wxApp::WakeUpIdle()
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiEnter();

-#endif // wxUSE_THREADS_
+#endif // wxUSE_THREADS

 
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();
 
     wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
         wxMutexGuiLeave();

-#endif // wxUSE_THREADS_
+#endif // wxUSE_THREADS

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 566e52abd7ef4f87b2ae19dcc9e176b7eea1f017..42f44e24fc361a6659b1a9aecc6522bcb0caa7bb 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -257,4 +257,4 @@ bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

-#endif // wxUSE_TOGGLEBUTTON
+#endif // wxUSE_TOGGLEBTN

diff --git a/src/motif/font.cpp b/src/motif/font.cpp
index 07db51f0ab8e4d8cc8468a2f0febc2c856aa3c67..d378180775f9def1b03973227e678c597a2372dc 100644 (file)
--- a/src/motif/font.cpp
+++ b/src/motif/font.cpp
@@ -61,7 +61,7 @@ public:
 #endif
 #if !wxMOTIF_USE_RENDER_TABLE
     WXFontList          m_fontList;     // Motif XmFontList
 #endif
 #if !wxMOTIF_USE_RENDER_TABLE
     WXFontList          m_fontList;     // Motif XmFontList

-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE

     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRendition         m_rendition;    // Motif XmRendition
 #endif
     WXRenderTable       m_renderTable;  // Motif XmRenderTable
     WXRendition         m_rendition;    // Motif XmRendition
 #endif


@@ -147,7 +147,7 @@ wxXFont::~wxXFont()
     if (m_fontList)
         XmFontListFree ((XmFontList) m_fontList);
     m_fontList = NULL;
     if (m_fontList)
         XmFontListFree ((XmFontList) m_fontList);
     m_fontList = NULL;

-#else // if wxUSE_RENDER_TABLE
+#else // if wxMOTIF_USE_RENDER_TABLE

     if (m_renderTable)
         XmRenderTableFree ((XmRenderTable) m_renderTable);
     m_renderTable = NULL;
     if (m_renderTable)
         XmRenderTableFree ((XmRenderTable) m_renderTable);
     m_renderTable = NULL;

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index a48d158ed4abc4db0cecaa4e1adff054322949a5..0a80f775cb8347daf9aa7bd3deff6c8a9bd4a360 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -54,7 +54,7 @@
 
 #if wxUSE_DATETIME
 #include "wx/datetime.h"
 
 #if wxUSE_DATETIME
 #include "wx/datetime.h"

-#endif // wxUSE_TIMEDATE
+#endif // wxUSE_DATETIME

 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;
 
 static void ClearVariant(VARIANTARG *pvarg) ;
 static void ReleaseVariant(VARIANTARG *pvarg) ;

diff --git a/src/palmos/spinbutt.cpp b/src/palmos/spinbutt.cpp
index d42b461d109a455a531519f0c849c082ab6a1c11..abd631450977a3aeb256c76dcb6b0a74bb85c7b9 100644 (file)
--- a/src/palmos/spinbutt.cpp
+++ b/src/palmos/spinbutt.cpp
@@ -147,4 +147,4 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 }
 
 #endif
 }
 
 #endif

-    // wxUSE_SPINCTN
+    // wxUSE_SPINBTN