Added regex to WXINC line (patch from Markus G)

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

diff --git a/wxPython/src/frames.i b/wxPython/src/frames.i
index cf4ee91b1bce54b4a90975aaa704623460ff27c1..69fc74db4e2543b4ebc3c4b6e338ef082175b4ac 100644 (file)
--- a/wxPython/src/frames.i
+++ b/wxPython/src/frames.i
@@ -16,6 +16,7 @@
 %{
 #include "helpers.h"
 #include <wx/minifram.h>
 %{
 #include "helpers.h"
 #include <wx/minifram.h>

+#include <wx/tipwin.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -47,8 +48,8 @@ enum {
 class wxFrame : public wxWindow {
 public:
     wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
 class wxFrame : public wxWindow {
 public:
     wxFrame(wxWindow* parent, const wxWindowID id, const wxString& title,

-            const wxPoint& pos = wxPyDefaultPosition,
-            const wxSize& size = wxPyDefaultSize,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,

             long style = wxDEFAULT_FRAME_STYLE,
             char* name = "frame");
 
             long style = wxDEFAULT_FRAME_STYLE,
             char* name = "frame");
 


@@ -85,9 +86,8 @@ public:
     wxPoint GetClientAreaOrigin() const;
     bool Command(int id);
     bool ProcessCommand(int id);
     wxPoint GetClientAreaOrigin() const;
     bool Command(int id);
     bool ProcessCommand(int id);

-#ifdef __WXMSW__

     bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

-#endif
+    bool IsFullScreen();

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -95,8 +95,8 @@ public:
 class wxMiniFrame : public wxFrame {
 public:
     wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
 class wxMiniFrame : public wxFrame {
 public:
     wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,

-                const wxPoint& pos = wxPyDefaultPosition,
-                const wxSize& size = wxPyDefaultSize,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,

                 long style = wxDEFAULT_FRAME_STYLE,
                 char* name = "frame");
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 char* name = "frame");
 


@@ -106,6 +106,17 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+class wxTipWindow : public wxFrame
+{
+public:
+    wxTipWindow(wxWindow *parent,
+                const wxString& text,
+                wxCoord maxLength = 100);
+};
+
+
+//---------------------------------------------------------------------------
+