Extract wxFDIOEventLoopSourceHandler in its own header.

[wxWidgets.git] / src / univ / winuniv.cpp

diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp
index fdcd178c50fdff2a708798cc8ffdf806cb20a8c5..f6e19ec4d801dbd998ef9e238cba544b4964920e 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        src/univ/window.cpp
+// Name:        src/univ/winuniv.cpp

 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of extra wxWindow methods for wxUniv port
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -94,8 +94,6 @@ public:
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXOSX_OR_COCOA__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
 #elif defined(__WXOSX_OR_COCOA__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac)

-#elif defined(__WXMGL__)
-    IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)

 #elif defined(__WXDFB__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB)
 #elif defined(__WXX11__)
 #elif defined(__WXDFB__)
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowDFB)
 #elif defined(__WXX11__)


@@ -258,7 +256,7 @@ void wxWindow::SetBackground(const wxBitmap& bitmap,
 const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
                                                wxStretch *stretch) const
 {
 const wxBitmap& wxWindow::GetBackgroundBitmap(int *alignment,
                                                wxStretch *stretch) const
 {

-    if ( m_bitmapBg.Ok() )
+    if ( m_bitmapBg.IsOk() )

     {
         if ( alignment )
             *alignment = m_alignBgBitmap;
     {
         if ( alignment )
             *alignment = m_alignBgBitmap;


@@ -408,7 +406,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
 
 void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
 {
 
 void wxWindow::EraseBackground(wxDC& dc, const wxRect& rect)
 {

-    if ( GetBackgroundBitmap().Ok() )
+    if ( GetBackgroundBitmap().IsOk() )

     {
         // Get the bitmap and the flags
         int alignment;
     {
         // Get the bitmap and the flags
         int alignment;


@@ -718,14 +716,9 @@ void wxWindow::OnSize(wxSizeEvent& event)
 #endif
 }
 
 #endif
 }
 

-wxSize wxWindow::DoGetBestSize() const
+wxSize wxWindow::DoGetBorderSize() const

 {
 {

-    return AdjustSize(DoGetBestClientSize());
-}
-
-wxSize wxWindow::DoGetBestClientSize() const
-{
-    return wxWindowNative::DoGetBestSize();
+    return AdjustSize(wxSize(0, 0));

 }
 
 wxSize wxWindow::AdjustSize(const wxSize& size) const
 }
 
 wxSize wxWindow::AdjustSize(const wxSize& size) const


@@ -927,7 +920,7 @@ void wxWindow::SetScrollbar(int orient,
 {
 #if wxUSE_SCROLLBAR
     wxASSERT_MSG( pageSize <= range,
 {
 #if wxUSE_SCROLLBAR
     wxASSERT_MSG( pageSize <= range,

-                    _T("page size can't be greater than range") );
+                    wxT("page size can't be greater than range") );

 
     bool hasClientSizeChanged = false;
     wxScrollBar *scrollbar = GetScrollbar(orient);
 
     bool hasClientSizeChanged = false;
     wxScrollBar *scrollbar = GetScrollbar(orient);


@@ -1145,7 +1138,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 
 wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 {
 
 wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 {

-    wxASSERT_MSG( !dx || !dy, _T("can't be used for diag scrolling") );
+    wxASSERT_MSG( !dx || !dy, wxT("can't be used for diag scrolling") );

 
     // the rect to refresh (which we will calculate)
     wxRect rect;
 
     // the rect to refresh (which we will calculate)
     wxRect rect;


@@ -1160,7 +1153,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
     // location
     wxSize sizeTotal = rectTotal ? rectTotal->GetSize() : GetClientSize();
 
     // location
     wxSize sizeTotal = rectTotal ? rectTotal->GetSize() : GetClientSize();
 

-    wxLogTrace(_T("scroll"), _T("rect is %dx%d, scroll by %d, %d"),
+    wxLogTrace(wxT("scroll"), wxT("rect is %dx%d, scroll by %d, %d"),

                sizeTotal.x, sizeTotal.y, dx, dy);
 
     // the initial and end point of the region we move in client coords
                sizeTotal.x, sizeTotal.y, dx, dy);
 
     // the initial and end point of the region we move in client coords


@@ -1178,7 +1171,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
     if ( size.x <= 0 || size.y <= 0 )
     {
         // just redraw everything as nothing of the displayed image will stay
     if ( size.x <= 0 || size.y <= 0 )
     {
         // just redraw everything as nothing of the displayed image will stay

-        wxLogTrace(_T("scroll"), _T("refreshing everything"));
+        wxLogTrace(wxT("scroll"), wxT("refreshing everything"));

 
         rect = rectTotal ? *rectTotal : wxRect(0, 0, sizeTotal.x, sizeTotal.y);
     }
 
         rect = rectTotal ? *rectTotal : wxRect(0, 0, sizeTotal.x, sizeTotal.y);
     }


@@ -1230,8 +1223,8 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
                   );
         dc.Blit(ptDest, size, &dcMem, wxPoint(0,0));
 
                   );
         dc.Blit(ptDest, size, &dcMem, wxPoint(0,0));
 

-        wxLogTrace(_T("scroll"),
-                   _T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),
+        wxLogTrace(wxT("scroll"),
+                   wxT("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),

                    ptSource.x, ptSource.y,
                    size.x, size.y,
                    ptDest.x, ptDest.y);
                    ptSource.x, ptSource.y,
                    size.x, size.y,
                    ptDest.x, ptDest.y);


@@ -1262,7 +1255,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 
             rect.height = sizeTotal.y;
 
 
             rect.height = sizeTotal.y;
 

-            wxLogTrace(_T("scroll"), _T("refreshing (%d, %d)-(%d, %d)"),
+            wxLogTrace(wxT("scroll"), wxT("refreshing (%d, %d)-(%d, %d)"),

                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }
                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }


@@ -1283,7 +1276,7 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
 
             rect.width = sizeTotal.x;
 
 
             rect.width = sizeTotal.x;
 

-            wxLogTrace(_T("scroll"), _T("refreshing (%d, %d)-(%d, %d)"),
+            wxLogTrace(wxT("scroll"), wxT("refreshing (%d, %d)-(%d, %d)"),

                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }
                        rect.x, rect.y,
                        rect.GetRight() + 1, rect.GetBottom() + 1);
         }


@@ -1329,7 +1322,7 @@ void wxWindow::OnKeyDown(wxKeyEvent& event)
         int command = win->GetAcceleratorTable()->GetCommand(event);
         if ( command != -1 )
         {
         int command = win->GetAcceleratorTable()->GetCommand(event);
         if ( command != -1 )
         {

-            wxCommandEvent eventCmd(wxEVT_COMMAND_MENU_SELECTED, command);
+            wxCommandEvent eventCmd(wxEVT_MENU, command);

             if ( win->GetEventHandler()->ProcessEvent(eventCmd) )
             {
                 // skip "event.Skip()" below
             if ( win->GetEventHandler()->ProcessEvent(eventCmd) )
             {
                 // skip "event.Skip()" below


@@ -1360,7 +1353,7 @@ void wxWindow::OnKeyDown(wxKeyEvent& event)
                 wxWindow* child = win->FindWindow(command);
                 if ( child && wxDynamicCast(child, wxButton) )
                 {
                 wxWindow* child = win->FindWindow(command);
                 if ( child && wxDynamicCast(child, wxButton) )
                 {

-                    wxCommandEvent eventCmd(wxEVT_COMMAND_BUTTON_CLICKED, command);
+                    wxCommandEvent eventCmd(wxEVT_BUTTON, command);

                     eventCmd.SetEventObject(child);
                     if ( child->GetEventHandler()->ProcessEvent(eventCmd) )
                     {
                     eventCmd.SetEventObject(child);
                     if ( child->GetEventHandler()->ProcessEvent(eventCmd) )
                     {


@@ -1435,7 +1428,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
             wxButton *btn = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
             if ( btn )
             {
             wxButton *btn = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
             if ( btn )
             {

-                wxCommandEvent evt(wxEVT_COMMAND_BUTTON_CLICKED, btn->GetId());
+                wxCommandEvent evt(wxEVT_BUTTON, btn->GetId());

                 evt.SetEventObject(btn);
                 btn->Command(evt);
                 return;
                 evt.SetEventObject(btn);
                 btn->Command(evt);
                 return;