Some more WXWIN_COMPATIBILITY fixes.

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

diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h
index 1debcd008230d2ff00e1623d64db2805725aef28..97ba03c69adcbb7c8a62003cc775d732ed60b86f 100644 (file)
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -29,7 +29,7 @@ public:
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ,
+           long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ,

            const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
            const wxString& name = wxFrameNameStr)
   {
       Create(parent, id, title, pos, size, style, name);

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index ae581ed5f86c351641d58b26a215ad57af3e4eb2..19837e185fb6f4365dfc53c1aee8e4c3d09f64d6 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -50,9 +50,9 @@ PERIPH_TARGET=xpm $(PERIPH_TARGET)
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 
 PERIPH_CLEAN_TARGET=clean_xpm $(PERIPH_CLEAN_TARGET)
 !endif
 

-PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(PERIPH_LIBS)
-PERIPH_TARGET=zlib $(PERIPH_TARGET)
-PERIPH_CLEAN_TARGET=clean_zlib $(PERIPH_CLEAN_TARGET)
+PERIPH_LIBS=$(WXDIR)\lib\zlib.lib $(WXDIR)\lib\winpng.lib $(PERIPH_LIBS)
+PERIPH_TARGET=zlib png $(PERIPH_TARGET)
+PERIPH_CLEAN_TARGET=clean_zlib clean_png $(PERIPH_CLEAN_TARGET)

 
 !if "$(DLL)" == "0"
 DUMMY=dummy
 
 !if "$(DLL)" == "0"
 DUMMY=dummy


@@ -176,6 +176,7 @@ MSWOBJS = \
   $(MSWDIR)\dde.obj \
   $(MSWDIR)\dialog.obj \
   $(MSWDIR)\dib.obj \
   $(MSWDIR)\dde.obj \
   $(MSWDIR)\dialog.obj \
   $(MSWDIR)\dib.obj \

+  $(MSWDIR)\dibutils.obj \

   $(MSWDIR)\dirdlg.obj \
   $(MSWDIR)\filedlg.obj \
   $(MSWDIR)\font.obj \
   $(MSWDIR)\dirdlg.obj \
   $(MSWDIR)\filedlg.obj \
   $(MSWDIR)\font.obj \


@@ -203,6 +204,7 @@ MSWOBJS = \
   $(MSWDIR)\palette.obj \
   $(MSWDIR)\pen.obj \
   $(MSWDIR)\penwin.obj \
   $(MSWDIR)\palette.obj \
   $(MSWDIR)\pen.obj \
   $(MSWDIR)\penwin.obj \

+  $(MSWDIR)\pnghand.obj \

   $(MSWDIR)\printdlg.obj \
   $(MSWDIR)\printwin.obj \
   $(MSWDIR)\radiobox.obj \
   $(MSWDIR)\printdlg.obj \
   $(MSWDIR)\printwin.obj \
   $(MSWDIR)\radiobox.obj \


@@ -642,6 +644,16 @@ wxxpm:     $(CFG)
        make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
        cd $(WXDIR)\src\msw
 
        make -f makefile.b32 -DCFG=$(CFG) -DFINAL=$(FINAL) -DWXWIN=$(WXDIR) -DDEBUG=$(DEBUG)
        cd $(WXDIR)\src\msw
 

+png:    $(CFG)
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 
+        cd $(WXDIR)\src\msw
+
+clean_png:
+        cd $(WXDIR)\src\png
+        make -f makefile.b32 clean
+        cd $(WXDIR)\src\msw
+

 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
         make -f makefile.b32 lib
 zlib:   $(CFG)
         cd $(WXDIR)\src\zlib
         make -f makefile.b32 lib

diff --git a/src/msw/scrolbar.cpp b/src/msw/scrolbar.cpp
index d111e085639bde4a89a86b0b02eae46d6945c72b..904fc74ec7a246b09d70cb6f07d0431285e94f73 100644 (file)
--- a/src/msw/scrolbar.cpp
+++ b/src/msw/scrolbar.cpp
@@ -34,11 +34,11 @@ extern void wxFindMaxSize(HWND hwnd, RECT *rect);
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

-#if WXWIN_COMPATIBILITY

 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
 BEGIN_EVENT_TABLE(wxScrollBar, wxControl)

+#if WXWIN_COMPATIBILITY

   EVT_SCROLL(wxScrollBar::OnScroll)
   EVT_SCROLL(wxScrollBar::OnScroll)

-END_EVENT_TABLE()

 #endif
 #endif

+END_EVENT_TABLE()

 
 #endif
 
 
 #endif
 


@@ -183,7 +183,7 @@ void wxScrollBar::MSWOnVScroll(WXWORD wParam, WXWORD pos, WXHWND control)
         if (new_pos > maxPos)
             new_pos = maxPos;
 
         if (new_pos > maxPos)
             new_pos = maxPos;
 

-        SetValue(new_pos);
+        SetThumbPosition(new_pos);

         wxScrollEvent event(scrollEvent, m_windowId);
         event.SetPosition(new_pos);
         event.SetEventObject( this );
         wxScrollEvent event(scrollEvent, m_windowId);
         event.SetPosition(new_pos);
         event.SetEventObject( this );


@@ -331,7 +331,7 @@ WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetValue(event.m_commandInt);
+    SetThumbPosition(event.m_commandInt);

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 5347975b7159ebab176528a6db78ae1c647af6b7..20f3620080eb79cf752db1853aab270ee5746ce9 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -36,11 +36,11 @@
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
 

-#if WXWIN_COMPATIBILITY

 BEGIN_EVENT_TABLE(wxSlider95, wxControl)
 BEGIN_EVENT_TABLE(wxSlider95, wxControl)

+#if WXWIN_COMPATIBILITY

   EVT_SCROLL(wxSlider95::OnScroll)
   EVT_SCROLL(wxSlider95::OnScroll)

-END_EVENT_TABLE()

 #endif
 #endif

+END_EVENT_TABLE()

 
 #endif
 
 
 #endif
 

diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp
index 5e8e5dab765008b871d71e0d8b066192a126f876..dd58502449ffd5a69bfab6fc8b960796f8da3ab9 100644 (file)
--- a/src/msw/tbar95.cpp
+++ b/src/msw/tbar95.cpp
@@ -488,7 +488,7 @@ wxToolBarTool *wxToolBar95::AddTool(int index, const wxBitmap& bitmap, const wxB
   else
     tool->m_y = m_yMargin;
 
   else
     tool->m_y = m_yMargin;
 

-  tool->SetSize(GetDefaultButtonWidth(), GetDefaultButtonHeight());
+  tool->SetSize(GetToolSize().x, GetToolSize().y);

 
   m_tools.Append((long)index, tool);
   return tool;
 
   m_tools.Append((long)index, tool);
   return tool;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 3e4096094f69fd6f39234f62f0316167ed6e3fa6..a3ee4e93e14b647990bd3e2836f2151d327b5bc5 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3189,7 +3189,7 @@ int wxWindow::GetScrollRange(int orient) const
 #if defined(__WIN95__)
         // Try to adjust the range to cope with page size > 1
         // - a Windows API quirk
 #if defined(__WIN95__)
         // Try to adjust the range to cope with page size > 1
         // - a Windows API quirk

-        int pageSize = GetScrollPage(orient);
+        int pageSize = GetScrollThumb(orient);

         if ( pageSize > 1 )
         {
             maxPos -= (pageSize - 1);
         if ( pageSize > 1 )
         {
             maxPos -= (pageSize - 1);