Improved preprocessor guards for numeric dialogs.

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

diff --git a/include/wx/generic/numdlgg.h b/include/wx/generic/numdlgg.h
index 6e0e40f930a4efe60987898dc33cee3ac6594183..28594627458a62a2ef28777101b8780ea9a0e6de 100644 (file)
--- a/include/wx/generic/numdlgg.h
+++ b/include/wx/generic/numdlgg.h
@@ -12,10 +12,10 @@
 #ifndef __NUMDLGH_G__
 #define __NUMDLGH_G__
 
 #ifndef __NUMDLGH_G__
 #define __NUMDLGH_G__
 

-#if wxUSE_NUMBERDLG
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

+#if wxUSE_NUMBERDLG
+

 #include "wx/dialog.h"
 
 #if wxUSE_SPINCTRL
 #include "wx/dialog.h"
 
 #if wxUSE_SPINCTRL


@@ -77,4 +77,3 @@ wxGetNumberFromUser(const wxString& message,
 #endif // wxUSE_NUMBERDLG
 
 #endif // __NUMDLGH_G__
 #endif // wxUSE_NUMBERDLG
 
 #endif // __NUMDLGH_G__

-

diff --git a/include/wx/numdlg.h b/include/wx/numdlg.h
index 332bac3cb5c4b3b2d84fe00f54c72022bb623a78..ba8ea1cd7d2b831374d4dee1e012afd9a6263383 100644 (file)
--- a/include/wx/numdlg.h
+++ b/include/wx/numdlg.h
@@ -12,6 +12,8 @@
 #ifndef _WX_NUMDLGDLG_H_BASE_
 #define _WX_NUMDLGDLG_H_BASE_
 
 #ifndef _WX_NUMDLGDLG_H_BASE_
 #define _WX_NUMDLGDLG_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_NUMBERDLG
 
 #include "wx/generic/numdlgg.h"
 #if wxUSE_NUMBERDLG
 
 #include "wx/generic/numdlgg.h"


@@ -19,4 +21,3 @@
 #endif // wxUSE_NUMBERDLG
 
 #endif // _WX_NUMDLGDLG_H_BASE_
 #endif // wxUSE_NUMBERDLG
 
 #endif // _WX_NUMDLGDLG_H_BASE_

-