Added SetFont to most controls and controls sample

[wxWidgets.git] / include / wx / utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 902863ce4900f7ab05ad4432f4af82874e5fe69c..ed0115dc82e41c70dba922b9fb7492a38b017c3a 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __UTILSH__
-#define __UTILSH__
+#ifndef _WX_UTILSH__
+#define _WX_UTILSH__

 
 #ifdef __GNUG__
 #pragma interface "utils.h"
 
 #ifdef __GNUG__
 #pragma interface "utils.h"


@@ -98,9 +98,9 @@ void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE,

-                           wxProcess *process = NULL);
+                           wxProcess *process = (wxProcess *) NULL);

 long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,
 long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE,

-                           wxProcess *process = NULL);
+                           wxProcess *process = (wxProcess *) NULL);

 
 #define wxSIGTERM 1
 
 
 #define wxSIGTERM 1
 


@@ -139,15 +139,15 @@ bool WXDLLEXPORT wxGetUserName(char *buf, int maxSize);
 /*
  * Strip out any menu codes
  */
 /*
  * Strip out any menu codes
  */

-char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = NULL);
+char* WXDLLEXPORT wxStripMenuCodes(char *in, char *out = (char *) NULL);

 
 // Find the window/widget with the given title or label.
 // Pass a parent to begin the search from, or NULL to look through
 // all windows.
 
 // Find the window/widget with the given title or label.
 // Pass a parent to begin the search from, or NULL to look through
 // all windows.

-wxWindow* WXDLLEXPORT wxFindWindowByLabel(const wxString& title, wxWindow *parent = NULL);
+wxWindow* WXDLLEXPORT wxFindWindowByLabel(const wxString& title, wxWindow *parent = (wxWindow *) NULL);

 
 // Find window by name, and if that fails, by label.
 
 // Find window by name, and if that fails, by label.

-wxWindow* WXDLLEXPORT wxFindWindowByName(const wxString& name, wxWindow *parent = NULL);
+wxWindow* WXDLLEXPORT wxFindWindowByName(const wxString& name, wxWindow *parent = (wxWindow *) NULL);

 
 // Returns menu item id or -1 if none.
 int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString);
 
 // Returns menu item id or -1 if none.
 int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, const wxString& itemString);


@@ -182,7 +182,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
     int sync(void);
 };
 
     int sync(void);
 };
 

-#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS

 #define new WXDEBUG_NEW
 #endif
 
 #define new WXDEBUG_NEW
 #endif
 


@@ -213,7 +213,7 @@ void WXDLLEXPORT wxDebugMsg(const char *fmt ...) ;
 void WXDLLEXPORT wxBell(void) ;
   
 // Get OS version
 void WXDLLEXPORT wxBell(void) ;
   
 // Get OS version

-int WXDLLEXPORT wxGetOsVersion(int *majorVsn=NULL,int *minorVsn=NULL) ;
+int WXDLLEXPORT wxGetOsVersion(int *majorVsn= (int *) NULL,int *minorVsn= (int *) NULL) ;

 
 // Set the cursor to the busy cursor for all windows
 class WXDLLEXPORT wxCursor;
 
 // Set the cursor to the busy cursor for all windows
 class WXDLLEXPORT wxCursor;


@@ -266,7 +266,7 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
 
 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.
 
 // MSW only: get user-defined resource from the .res file.
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 extern const char* WXDLLEXPORT wxUserResourceStr;
 char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
 #endif
 extern const char* WXDLLEXPORT wxUserResourceStr;
 char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
 #endif


@@ -309,4 +309,4 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 #endif //__X__
 
 #endif
 #endif //__X__
 
 #endif

-    // __UTILSH__
+    // _WX_UTILSH__