Interface fixes and tweaks for Phoenix

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

diff --git a/interface/wx/anybutton.h b/interface/wx/anybutton.h
index fa59a5373bd6ded6385af10a09c86a44b1d16552..448ddd574216a14ddda3d037008e8d71787ca96f 100644 (file)
--- a/interface/wx/anybutton.h
+++ b/interface/wx/anybutton.h
@@ -14,6 +14,7 @@
 
 #define wxBU_EXACTFIT        0x0001
 #define wxBU_NOTEXT          0x0002
+#define wxBU_AUTODRAW        0x0004
 
 
 /**

diff --git a/interface/wx/dirdlg.h b/interface/wx/dirdlg.h
index f844523a8735ff7db8cf0b8dcb3d82b8113b0168..2e0c607f072a3421d45f86a5759a433ce591e1a1 100644 (file)
--- a/interface/wx/dirdlg.h
+++ b/interface/wx/dirdlg.h
@@ -6,6 +6,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define wxDD_DEFAULT_STYLE      (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+
 /**
     @class wxDirDialog
 

diff --git a/interface/wx/event.h b/interface/wx/event.h
index 7cf8ec67f4d1008f0b1c8f3a75fd7020f3a81de2..cb1b2aeb63f9db33fe9d35f7b3e2737979fe8ba6 100644 (file)
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -1560,6 +1560,23 @@ public:
 
 
 
+enum
+{
+    wxJOYSTICK1,
+    wxJOYSTICK2
+};
+
+// Which button is down?
+enum
+{
+    wxJOY_BUTTON_ANY = -1,
+    wxJOY_BUTTON1    = 1,
+    wxJOY_BUTTON2    = 2,
+    wxJOY_BUTTON3    = 4,
+    wxJOY_BUTTON4    = 8
+};
+
+
 /**
     @class wxJoystickEvent
 

diff --git a/interface/wx/filedlg.h b/interface/wx/filedlg.h
index e8dd2363239bed5e3cf90c2feefbbc31afb65159..63b6bbedd8d1a18b9af3d937f0ef83816bb799dd 100644 (file)
--- a/interface/wx/filedlg.h
+++ b/interface/wx/filedlg.h
@@ -17,6 +17,8 @@ enum
     wxFD_PREVIEW           = 0x0100
 };
 
+#define wxFD_DEFAULT_STYLE      wxFD_OPEN
+
 /**
     @class wxFileDialog
 

diff --git a/interface/wx/image.h b/interface/wx/image.h
index 8f19e19969400f87cf4bee1fff579ebcec791376..de1676a55fbbcd597a4d6cfcae2cd1c58b46951d 100644 (file)
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -350,6 +350,9 @@ const unsigned char wxIMAGE_ALPHA_TRANSPARENT = 0;
 */
 const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff;
 
+const unsigned char wxIMAGE_ALPHA_THRESHOLD = 0x80;
+
+
 /**
     @class wxImage
 

diff --git a/interface/wx/process.h b/interface/wx/process.h
index 80117f40ff6cc398d2e75036e3a14897051d764d..edbe214ffaf555281fdc4b1ac01de4be8b0557f4 100644 (file)
--- a/interface/wx/process.h
+++ b/interface/wx/process.h
@@ -6,41 +6,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/**
-    Signal constants used by wxProcess.
-*/
-enum wxSignal
-{
-    wxSIGNONE = 0,  //!< verify if the process exists under Unix
-    wxSIGHUP,
-    wxSIGINT,
-    wxSIGQUIT,
-    wxSIGILL,
-    wxSIGTRAP,
-    wxSIGABRT,
-    wxSIGEMT,
-    wxSIGFPE,
-    wxSIGKILL,      //!< forcefully kill, dangerous!
-    wxSIGBUS,
-    wxSIGSEGV,
-    wxSIGSYS,
-    wxSIGPIPE,
-    wxSIGALRM,
-    wxSIGTERM       //!< terminate the process gently
-};
-
-/**
-    Return values for wxProcess::Kill.
-*/
-enum wxKillError
-{
-    wxKILL_OK,              //!< no error
-    wxKILL_BAD_SIGNAL,      //!< no such signal
-    wxKILL_ACCESS_DENIED,   //!< permission denied
-    wxKILL_NO_PROCESS,      //!< no such process
-    wxKILL_ERROR            //!< another, unspecified error
-};
-
 
 /**
     @class wxProcess

diff --git a/interface/wx/scrolbar.h b/interface/wx/scrolbar.h
index 5ecc4813205511572f67c851d649ec9b430c7947..9a90d332ad81a965f58ba71fd4ce4bd681874513 100644 (file)
--- a/interface/wx/scrolbar.h
+++ b/interface/wx/scrolbar.h
@@ -240,5 +240,10 @@ public:
         @see GetThumbPosition()
     */
     virtual void SetThumbPosition(int viewStart);
+
+    /**
+       Returns @true for scrollbars that have the vertical style set.
+    */
+    bool IsVertical() const;
 };
 

diff --git a/interface/wx/textctrl.h b/interface/wx/textctrl.h
index b3bb03dc467041d8dd8ff5b4c39e7a969a57fd7f..048cf6564aa4fc9eace97bf41dc93c09e42c7a34 100644 (file)
--- a/interface/wx/textctrl.h
+++ b/interface/wx/textctrl.h
@@ -52,6 +52,8 @@
 #define wxTE_RICH2          0x8000
 
 
+#define wxTEXT_TYPE_ANY     0
+
 
 /**
    wxTextCoord is a line or row number

diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 813925bf278dcf495fce1c0bc45701ba988e2aae..2656212f0b10cf912efd7b2f2119013813bf6f31 100644 (file)
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -34,6 +34,14 @@ enum
                           wxFULLSCREEN_NOCAPTION
 };
 
+#define wxDEFAULT_FRAME_STYLE (wxSYSTEM_MENU |          \
+                               wxRESIZE_BORDER |        \
+                               wxMINIMIZE_BOX |         \
+                               wxMAXIMIZE_BOX |         \
+                               wxCLOSE_BOX |            \
+                               wxCAPTION |              \
+                               wxCLIP_CHILDREN)
+
 /**
     @class wxTopLevelWindow
 

diff --git a/interface/wx/utils.h b/interface/wx/utils.h
index 3dfa72f319515d719d2c35fc22a4c00a94d2c7b9..0ce06ea02c4333c79dc30c2cc6c5a7bb4a56f2f3 100644 (file)
--- a/interface/wx/utils.h
+++ b/interface/wx/utils.h
@@ -6,6 +6,56 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+/**
+    Signal constants used by wxProcess.
+*/
+enum wxSignal
+{
+    wxSIGNONE = 0,  //!< verify if the process exists under Unix
+    wxSIGHUP,
+    wxSIGINT,
+    wxSIGQUIT,
+    wxSIGILL,
+    wxSIGTRAP,
+    wxSIGABRT,
+    wxSIGEMT,
+    wxSIGFPE,
+    wxSIGKILL,      //!< forcefully kill, dangerous!
+    wxSIGBUS,
+    wxSIGSEGV,
+    wxSIGSYS,
+    wxSIGPIPE,
+    wxSIGALRM,
+    wxSIGTERM       //!< terminate the process gently
+};
+
+/**
+    Return values for wxProcess::Kill.
+*/
+enum wxKillError
+{
+    wxKILL_OK,              //!< no error
+    wxKILL_BAD_SIGNAL,      //!< no such signal
+    wxKILL_ACCESS_DENIED,   //!< permission denied
+    wxKILL_NO_PROCESS,      //!< no such process
+    wxKILL_ERROR            //!< another, unspecified error
+};
+
+enum wxKillFlags
+{
+    wxKILL_NOCHILDREN = 0,  //!< don't kill children
+    wxKILL_CHILDREN = 1     //!< kill children
+};
+
+enum wxShutdownFlags
+{
+    wxSHUTDOWN_FORCE    = 1, //!< can be combined with other flags (MSW-only)
+    wxSHUTDOWN_POWEROFF = 2, //!< power off the computer
+    wxSHUTDOWN_REBOOT   = 4, //!< shutdown and reboot
+    wxSHUTDOWN_LOGOFF   = 8  //!< close session (currently MSW-only)
+};
+
+
 /**
     @class wxWindowDisabler
 
@@ -523,6 +573,22 @@ void wxQsort(void* pbase, size_t total_elems,
 */
 void wxSetDisplayName(const wxString& displayName);
 
+
+/**
+   flags for wxStripMenuCodes
+*/
+enum
+{
+    // strip '&' characters
+    wxStrip_Mnemonics = 1,
+
+    // strip everything after '\t'
+    wxStrip_Accel = 2,
+
+    // strip everything (this is the default)
+    wxStrip_All = wxStrip_Mnemonics | wxStrip_Accel
+};
+
 /**
     Strips any menu codes from @a str and returns the result.
 

diff --git a/interface/wx/wrapsizer.h b/interface/wx/wrapsizer.h
index f3e09387ca890daa1ed0406a8dd65a3cf7fe1dd6..da82f34e1982273cf8f75634dc0288cdaf9eb830 100644 (file)
--- a/interface/wx/wrapsizer.h
+++ b/interface/wx/wrapsizer.h
@@ -6,6 +6,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// flags for wxWrapSizer
+enum
+{
+    wxEXTEND_LAST_ON_EACH_LINE,
+    wxREMOVE_LEADING_SPACES,
+    wxWRAPSIZER_DEFAULT_FLAGS
+};
+
 /**
     @class wxWrapSizer