Sorry, should be a __UNIX__ test

[wxWidgets.git] / include / wx / xrc / xmlres.h

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index 51118d1ea115b6705568b7c2315c714169a9d12c..737ed87f216af262e219bc6ac34bda6e639d15f8 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -11,7 +11,7 @@
 #ifndef _WX_XMLRES_H_
 #define _WX_XMLRES_H_
 
 #ifndef _WX_XMLRES_H_
 #define _WX_XMLRES_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "xmlres.h"
 #endif
 
 #pragma interface "xmlres.h"
 #endif
 


@@ -389,7 +389,7 @@ protected:
 
     // Gets an integer value from the parameter.
     long GetLong(const wxString& param, long defaultv = 0);
 
     // Gets an integer value from the parameter.
     long GetLong(const wxString& param, long defaultv = 0);

-    
+

     // Gets a float value from the parameter.
     float GetFloat(const wxString& param, float defaultv = 0);
 
     // Gets a float value from the parameter.
     float GetFloat(const wxString& param, float defaultv = 0);
 


@@ -397,13 +397,15 @@ protected:
     wxColour GetColour(const wxString& param);
 
     // Gets the size (may be in dialog units).
     wxColour GetColour(const wxString& param);
 
     // Gets the size (may be in dialog units).

-    wxSize GetSize(const wxString& param = wxT("size"));
+    wxSize GetSize(const wxString& param = wxT("size"),
+                   wxWindow *windowToUse = NULL);

 
     // Gets the position (may be in dialog units).
     wxPoint GetPosition(const wxString& param = wxT("pos"));
 
     // Gets a dimension (may be in dialog units).
 
     // Gets the position (may be in dialog units).
     wxPoint GetPosition(const wxString& param = wxT("pos"));
 
     // Gets a dimension (may be in dialog units).

-    wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0);
+    wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
+                         wxWindow *windowToUse = NULL);

 
     // Gets a bitmap.
     wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
 
     // Gets a bitmap.
     wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),