Second try at doing Set/GetClient right

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

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 530e38f3099f4f91845cc0c267b4e44e7db5ced6..e92325e6903ffd6951343529c646ad24ec62b175 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"


@@ -21,11 +21,15 @@
 #include "wx/list.h"
 #include "wx/window.h"
 #include "wx/filefn.h"
 #include "wx/list.h"
 #include "wx/window.h"
 #include "wx/filefn.h"

+#include "wx/process.h"

 
 

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #include <iostream.h>
 #else
 #include <iostream>
 #include <iostream.h>
 #else
 #include <iostream>

+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 
 #ifdef __X__
 #endif
 
 #ifdef __X__


@@ -90,14 +94,17 @@ bool WXDLLEXPORT StringMatch(char *one, char *two, bool subString = TRUE, bool e
 #define wxStringEq(s1, s2) (s1 && s2 && (strcmp(s1, s2) == 0))
 
 // Convert 2-digit hex number to decimal
 #define wxStringEq(s1, s2) (s1 && s2 && (strcmp(s1, s2) == 0))
 
 // Convert 2-digit hex number to decimal

-int WXDLLEXPORT wxHexToDec(char *buf);
+int WXDLLEXPORT wxHexToDec(const wxString& buf);

 
 // Convert decimal integer to 2-character hex string
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);
 
 // Convert decimal integer to 2-character hex string
 void WXDLLEXPORT wxDecToHex(int dec, char *buf);

+wxString WXDLLEXPORT wxDecToHex(int dec);

 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.
 
 // Execute another program. Returns 0 if there was an error, a PID otherwise.

-long WXDLLEXPORT wxExecute(char **argv, bool Async = FALSE);
-long WXDLLEXPORT wxExecute(const wxString& command, bool Async = FALSE);
+long WXDLLEXPORT wxExecute(char **argv, bool sync = FALSE,
+                           wxProcess *process = (wxProcess *) NULL);
+long WXDLLEXPORT wxExecute(const wxString& command, bool sync = FALSE,
+                           wxProcess *process = (wxProcess *) NULL);

 
 #define wxSIGTERM 1
 
 
 #define wxSIGTERM 1
 


@@ -136,15 +143,16 @@ 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);
+wxString WXDLLEXPORT wxStripMenuCodes(const wxString& str);

 
 // 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);


@@ -164,9 +172,9 @@ int WXDLLEXPORT wxFindMenuItemId(wxFrame *frame, const wxString& menuString, con
 // Can't export a class derived from a non-export class
 #if !defined(_WINDLL) && !defined(WXUSINGDLL)
 
 // Can't export a class derived from a non-export class
 #if !defined(_WINDLL) && !defined(WXUSINGDLL)
 

-#ifdef new
-#undef new
-#endif
+// #ifdef new
+// #undef new
+// #endif

 
 class WXDLLEXPORT wxDebugStreamBuf: public streambuf
 {
 
 class WXDLLEXPORT wxDebugStreamBuf: public streambuf
 {


@@ -179,9 +187,9 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
     int sync(void);
 };
 
     int sync(void);
 };
 

-#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS
-#define new WXDEBUG_NEW
-#endif
+// #if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
+// #define new WXDEBUG_NEW
+// #endif

 
 #endif
 
 
 #endif
 


@@ -210,7 +218,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;


@@ -234,7 +242,7 @@ WXDLLEXPORT_DATA(extern const char*) wxFatalErrorStr;
 void WXDLLEXPORT wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr);
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 void WXDLLEXPORT wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr);
 
 // Reading and writing resources (eg WIN.INI, .Xdefaults)

-#if USE_RESOURCES
+#if wxUSE_RESOURCES

 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file = "");
 bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file = "");


@@ -244,13 +252,11 @@ bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, c
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file = "");
 bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = "");

-#endif // USE_RESOURCES
+#endif // wxUSE_RESOURCES
+
+// Get current Home dir and copy to dest (returns pstr->c_str())
+const char* WXDLLEXPORT wxGetHomeDir(wxString *pstr);

 
 

-#ifdef __UNIX__
-// 'X' Only, will soon vanish....
-// Get current Home dir and copy to dest
-char* WXDLLEXPORT wxGetHomeDir( char *dest );
-#endif

 // Get the user's home dir (caller must copy--- volatile)
 // returns NULL is no HOME dir is known
 char* WXDLLEXPORT wxGetUserHome(const wxString& user = "");
 // Get the user's home dir (caller must copy--- volatile)
 // returns NULL is no HOME dir is known
 char* WXDLLEXPORT wxGetUserHome(const wxString& user = "");


@@ -263,18 +269,16 @@ 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
 
 // X only
 #ifdef __X__
 extern const char* WXDLLEXPORT wxUserResourceStr;
 char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
 #endif
 
 // X only
 #ifdef __X__

-// Get X display: often needed in the wxWindows implementation.
-Display *wxGetDisplay(void);
-/* Matthew Flatt: Added wxSetDisplay and wxGetDisplayName */
+WXDisplay *wxGetDisplay();

 bool wxSetDisplay(const wxString& display_name);
 bool wxSetDisplay(const wxString& display_name);

-wxString wxGetDisplayName(void);
+wxString wxGetDisplayName();

 #endif
 
 #ifdef __X__
 #endif
 
 #ifdef __X__


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

-    // __UTILSH__
+    // _WX_UTILSH__