warning fix

[wxWidgets.git] / wxPython / src / _functions.i

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 02238b8ef58db3c5e1701d58574e1be67886a1e6..704f56eea8cd60edbd7e05c7881036b1800bc491 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -13,6 +13,10 @@
 // Not a %module
 
 
 // Not a %module
 
 

+%{
+#include <wx/stockitem.h>
+%}
+

 //---------------------------------------------------------------------------
 
 MAKE_CONST_WXSTRING(FileSelectorPromptStr);
 //---------------------------------------------------------------------------
 
 MAKE_CONST_WXSTRING(FileSelectorPromptStr);


@@ -27,13 +31,27 @@ long wxNewId();
 void wxRegisterId(long id);
 long wxGetCurrentId();
 
 void wxRegisterId(long id);
 long wxGetCurrentId();
 

+// Returns true if the ID is in the list of recognized stock actions
+bool wxIsStockID(wxWindowID id);
+ 
+// Returns true of the label is empty or label of a stock button with
+// given ID
+bool wxIsStockLabel(wxWindowID id, const wxString& label);
+
+// Returns label that should be used for given stock UI element (e.g. "&OK"
+// for wxID_OK):
+wxString wxGetStockLabel(wxWindowID id,
+                         bool withCodes = true,
+                         wxString accelerator = wxPyEmptyString);
+ 
+

 MustHaveApp(wxBell);
 void wxBell();
 
 MustHaveApp(wxEndBusyCursor);
 void wxEndBusyCursor();
 
 MustHaveApp(wxBell);
 void wxBell();
 
 MustHaveApp(wxEndBusyCursor);
 void wxEndBusyCursor();
 

-long wxGetElapsedTime(bool resetTimer = True);
+long wxGetElapsedTime(bool resetTimer = true);

 
 MustHaveApp(wxGetMousePosition);
 DocDeclA(
 
 MustHaveApp(wxGetMousePosition);
 DocDeclA(


@@ -145,7 +163,7 @@ wxString wxGetTextFromUser(const wxString& message,
                            const wxString& default_value = wxPyEmptyString,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            const wxString& default_value = wxPyEmptyString,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,

-                           bool centre = True);
+                           bool centre = true);

 
 MustHaveApp(wxGetPasswordFromUser);
 wxString wxGetPasswordFromUser(const wxString& message,
 
 MustHaveApp(wxGetPasswordFromUser);
 wxString wxGetPasswordFromUser(const wxString& message,


@@ -159,7 +177,7 @@ wxString wxGetPasswordFromUser(const wxString& message,
 //                         int LCOUNT, char** choices,
 //                         int nsel, int *selection,
 //                         wxWindow *parent = NULL, int x = -1, int y = -1,
 //                         int LCOUNT, char** choices,
 //                         int nsel, int *selection,
 //                         wxWindow *parent = NULL, int x = -1, int y = -1,

-//                         bool centre = True, int width=150, int height=200);
+//                         bool centre = true, int width=150, int height=200);

 
 
 MustHaveApp(wxGetSingleChoice);
 
 
 MustHaveApp(wxGetSingleChoice);


@@ -167,7 +185,7 @@ wxString wxGetSingleChoice(const wxString& message, const wxString& caption,
                            int choices, wxString* choices_array,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            int choices, wxString* choices_array,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,

-                           bool centre = True,
+                           bool centre = true,

                            int width=150, int height=200);
 
 MustHaveApp(wxGetSingleChoiceIndex);
                            int width=150, int height=200);
 
 MustHaveApp(wxGetSingleChoiceIndex);


@@ -175,7 +193,7 @@ int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption,
                            int choices, wxString* choices_array,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,
                            int choices, wxString* choices_array,
                            wxWindow *parent = NULL,
                            int x = -1, int y = -1,

-                           bool centre = True,
+                           bool centre = true,

                            int width=150, int height=200);
 
 
                            int width=150, int height=200);
 
 


@@ -186,6 +204,7 @@ int wxMessageBox(const wxString& message,
                  wxWindow *parent = NULL,
                  int x = -1, int y = -1);
 
                  wxWindow *parent = NULL,
                  int x = -1, int y = -1);
 

+// WXWIN_COMPATIBILITY_2_4

 MustHaveApp(wxGetNumberFromUser);
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,
 MustHaveApp(wxGetNumberFromUser);
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,


@@ -302,10 +321,45 @@ MustHaveApp(wxThread);
 #ifdef WXP_WITH_THREAD
         return wxThread::IsMain();
 #else
 #ifdef WXP_WITH_THREAD
         return wxThread::IsMain();
 #else

-        return True;
+        return true;

 #endif
     }
 %}
 
 #endif
     }
 %}
 

+//---------------------------------------------------------------------------
+
+// enum wxPowerType
+// {
+//     wxPOWER_SOCKET,
+//     wxPOWER_BATTERY,
+//     wxPOWER_UNKNOWN
+// };
+
+// DocDeclStr(
+//     wxPowerType , wxGetPowerType(),
+//     "Returns the type of power source as one of wx.POWER_SOCKET,
+// wx.POWER_BATTERY or wx.POWER_UNKNOWN.  wx.POWER_UNKNOWN is also the
+// default on platforms where this feature is not implemented.", "");
+
+
+// enum wxBatteryState
+// {
+//     wxBATTERY_NORMAL_STATE,    // system is fully usable
+//     wxBATTERY_LOW_STATE,       // start to worry
+//     wxBATTERY_CRITICAL_STATE,  // save quickly
+//     wxBATTERY_SHUTDOWN_STATE,  // too late
+//     wxBATTERY_UNKNOWN_STATE
+// };
+
+// DocDeclStr(
+//     wxBatteryState , wxGetBatteryState(),
+//     "Returns battery state as one of wx.BATTERY_NORMAL_STATE,
+// wx.BATTERY_LOW_STATE}, wx.BATTERY_CRITICAL_STATE,
+// wx.BATTERY_SHUTDOWN_STATE or wx.BATTERY_UNKNOWN_STATE.
+// wx.BATTERY_UNKNOWN_STATE is also the default on platforms where this
+// feature is not implemented.", "");
+
+
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------