Build fix.

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 029e3534a582ad322b8ddf16dfb09ceed9d7c832..da16865843a7f11e0b0cd00782d590a939e18337 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -113,7 +113,7 @@ public:
 
     // Called from wxExit() function, should terminate the application a.s.a.p.
     virtual void Exit();
 
     // Called from wxExit() function, should terminate the application a.s.a.p.
     virtual void Exit();

-    
+

     // Return the layout direction for the current locale
     virtual wxLayoutDirection GetLayoutDirection() const;
 
     // Return the layout direction for the current locale
     virtual wxLayoutDirection GetLayoutDirection() const;
 

diff --git a/include/wx/intl.h b/include/wx/intl.h
index 4a1b2b4ab8dc150eedc81b22ee634e28b50025fa..e7dcff8a9175bdb4cd3f789e5e80798a07bb32e5 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -16,6 +16,16 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

+// Make wxLayoutDirection enum available without need for wxUSE_INTL so wxWindow, wxApp
+// and other classes are not distrubed by wxUSE_INTL
+
+enum wxLayoutDirection
+{
+    wxLayout_Default,
+    wxLayout_LeftToRight,
+    wxLayout_RightToLeft
+};
+

 #if wxUSE_INTL
 
 #include "wx/fontenc.h"
 #if wxUSE_INTL
 
 #include "wx/fontenc.h"


@@ -302,13 +312,6 @@ enum wxLanguage
 
 // --- --- --- generated code ends here --- --- ---
 
 
 // --- --- --- generated code ends here --- --- ---
 

-enum wxLayoutDirection
-{
-    wxLayout_Default,
-    wxLayout_LeftToRight,
-    wxLayout_RightToLeft
-};
-

 // ----------------------------------------------------------------------------
 // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc.
 //                 translation information
 // ----------------------------------------------------------------------------
 // wxLanguageInfo: encapsulates wxLanguage to OS native lang.desc.
 //                 translation information


@@ -604,4 +607,3 @@ inline const wxChar *wxGetTranslation(const wxChar *sz1, const wxChar *sz2,
 #endif
 
 #endif // _WX_INTL_H_
 #endif
 
 #endif // _WX_INTL_H_

-

diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h
index a7480db8785acf7961a8c00563d65f6d82bdd923..65e01d9f72d9f232636bfc0ba1cade0d5dfc4224 100644 (file)
--- a/include/wx/stockitem.h
+++ b/include/wx/stockitem.h
@@ -43,9 +43,13 @@ enum wxStockLabelQueryFlag
 WXDLLEXPORT wxString wxGetStockLabel(wxWindowID id,
                                      long flags = wxSTOCK_WITH_MNEMONIC);
 
 WXDLLEXPORT wxString wxGetStockLabel(wxWindowID id,
                                      long flags = wxSTOCK_WITH_MNEMONIC);
 

-// Returns the accelerator that should be used for given stock UI element
-// (e.g. "Ctrl+x" for wxSTOCK_EXIT)
-WXDLLEXPORT wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id);
+#if wxUSE_ACCEL
+
+    // Returns the accelerator that should be used for given stock UI element
+    // (e.g. "Ctrl+x" for wxSTOCK_EXIT)
+    WXDLLEXPORT wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id);
+
+#endif

 
 #ifdef __WXGTK20__
 
 
 #ifdef __WXGTK20__
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 739309ac037134b65756161fdf582482eaa0a97f..e0b685a11021372884495d5a4376711533ee274e 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -191,7 +191,7 @@ public:
         // it is wxID_ANY which means "don't care"
     void SetId( wxWindowID winid ) { m_windowId = winid; }
     wxWindowID GetId() const { return m_windowId; }
         // it is wxID_ANY which means "don't care"
     void SetId( wxWindowID winid ) { m_windowId = winid; }
     wxWindowID GetId() const { return m_windowId; }

-    
+

         // get or change the layout direction (LTR or RTL) for this window,
         // wxLayout_Default is returned if layout direction is not supported
     virtual wxLayoutDirection GetLayoutDirection() const
         // get or change the layout direction (LTR or RTL) for this window,
         // wxLayout_Default is returned if layout direction is not supported
     virtual wxLayoutDirection GetLayoutDirection() const


@@ -1042,7 +1042,7 @@ public:
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 
     wxAccessible* GetOrCreateAccessible() ;
 #endif
 

-    
+

     // Set window transparency if the platform supports it
     virtual bool SetTransparent(wxByte WXUNUSED(alpha)) { return false; }
     virtual bool CanSetTransparent() { return false; }
     // Set window transparency if the platform supports it
     virtual bool SetTransparent(wxByte WXUNUSED(alpha)) { return false; }
     virtual bool CanSetTransparent() { return false; }

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index fed2b7aab32fcfbfc8bf7b0778878ef9977919b4..fa5db01ac9682e88b5ceeb0d0229e46368e2b7ae 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -224,7 +224,7 @@ wxLayoutDirection wxAppConsole::GetLayoutDirection() const
     {
         const wxLanguageInfo *const
             info = wxLocale::GetLanguageInfo(locale->GetLanguage());
     {
         const wxLanguageInfo *const
             info = wxLocale::GetLanguageInfo(locale->GetLanguage());

-        
+

         if ( info )
             return info->LayoutDirection;
     }
         if ( info )
             return info->LayoutDirection;
     }

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index bac9c10c1f5a68d47c275fd0208de6cdd45e349f..bda58fced82ed839f9bf90bafccfed60b7e83315 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -174,6 +174,8 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         stockLabel = wxStripMenuCodes( stockLabel );
     }
 
         stockLabel = wxStripMenuCodes( stockLabel );
     }
 

+#if wxUSE_ACCEL
+

     if (!stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR))
     {
         stockLabel += _T("\t");
     if (!stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR))
     {
         stockLabel += _T("\t");


@@ -183,9 +185,13 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
             stockLabel += accel.ToString();
     }
 
             stockLabel += accel.ToString();
     }
 

+#endif // wxUSE_ACCEL
+

     return stockLabel;
 }
 
     return stockLabel;
 }
 

+#if wxUSE_ACCEL
+

 wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
 {
     wxAcceleratorEntry ret;
 wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
 {
     wxAcceleratorEntry ret;


@@ -220,6 +226,8 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
     return ret;
 }
 
     return ret;
 }
 

+#endif // wxUSE_ACCEL
+

 bool wxIsStockLabel(wxWindowID id, const wxString& label)
 {
     if (label.empty())
 bool wxIsStockLabel(wxWindowID id, const wxString& label)
 {
     if (label.empty())