Commit 65a9f5ed authored by kjk's avatar kjk

WebCore:

        Reviewed by Nikolas Zimmermann.

        Move ScrollView stubs to ScrollViewGdk.cpp

        * platform/gdk/FrameGdk.h: remove comment that no longer makes sense
        * platform/gdk/ScrollViewGdk.cpp:
        (WebCore::ScrollView::addChild):
        (WebCore::ScrollView::removeChild):
        (WebCore::ScrollView::scrollPointRecursively):
        (WebCore::ScrollView::inWindow):
        (WebCore::ScrollView::wheelEvent):
        (WebCore::ScrollView::updateScrollbars):
        (WebCore::ScrollView::updateScrollInfo):
        (WebCore::ScrollView::windowToContents):
        (WebCore::ScrollView::contentsToWindow):
        (WebCore::ScrollView::scrollbarUnderMouse):
        * platform/gdk/TemporaryLinkStubs.cpp:

  WebKitTools:

        Reviewed by Nikolas Zimmermann.

        Load a url given on a command line in a way that also
        works for local (file://) urls.

        * GdkLauncher/main.cpp:
        (main):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@19954 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f7ee8f9d
2007-03-04 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Nikolas Zimmermann.
Move ScrollView stubs to ScrollViewGdk.cpp
* platform/gdk/FrameGdk.h: remove comment that no longer makes sense
* platform/gdk/ScrollViewGdk.cpp:
(WebCore::ScrollView::addChild):
(WebCore::ScrollView::removeChild):
(WebCore::ScrollView::scrollPointRecursively):
(WebCore::ScrollView::inWindow):
(WebCore::ScrollView::wheelEvent):
(WebCore::ScrollView::updateScrollbars):
(WebCore::ScrollView::updateScrollInfo):
(WebCore::ScrollView::windowToContents):
(WebCore::ScrollView::contentsToWindow):
(WebCore::ScrollView::scrollbarUnderMouse):
* platform/gdk/TemporaryLinkStubs.cpp:
2007-03-02 Kevin McCullough <kmccullough@apple.com>
Reviewed by Geoff.
......
......@@ -45,7 +45,6 @@ public:
FrameGdk(Page*, HTMLFrameOwnerElement*, FrameLoaderClientGdk*);
virtual ~FrameGdk();
// FrameGdk-only
void handleGdkEvent(GdkEvent*);
bool keyPress(const PlatformKeyboardEvent& keyEvent);
......
......@@ -33,9 +33,9 @@
#include "FrameView.h"
#include "GraphicsContext.h"
#include "IntRect.h"
#include "NotImplementedGdk.h"
#include "RenderLayer.h"
#include "assert.h"
#include <algorithm>
#include <gdk/gdk.h>
using namespace std;
......@@ -258,4 +258,60 @@ void ScrollView::setDrawable(GdkDrawable* gdkdrawable)
updateGeometry();
}
void ScrollView::addChild(Widget*)
{
notImplementedGdk();
}
void ScrollView::removeChild(Widget*)
{
notImplementedGdk();
}
void ScrollView::scrollPointRecursively(int x, int y)
{
notImplementedGdk();
}
bool ScrollView::inWindow() const
{
notImplementedGdk();
return true;
}
void ScrollView::wheelEvent(PlatformWheelEvent&)
{
notImplementedGdk();
}
void ScrollView::updateScrollbars()
{
notImplementedGdk();
}
int ScrollView::updateScrollInfo(short type, int current, int max, int pageSize)
{
notImplementedGdk();
return 0;
}
IntPoint ScrollView::windowToContents(const IntPoint& point) const
{
notImplementedGdk();
return point;
}
IntPoint ScrollView::contentsToWindow(const IntPoint& point) const
{
notImplementedGdk();
return point;
}
PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
{
return 0;
notImplementedGdk();
}
}
......@@ -247,17 +247,6 @@ void SearchPopupMenu::saveRecentSearches(const AtomicString& name, const Vector<
void SearchPopupMenu::loadRecentSearches(const AtomicString& name, Vector<String>& searchItems) { notImplementedGdk(); }
SearchPopupMenu::SearchPopupMenu(PopupMenuClient* client) : PopupMenu(client) { notImplementedGdk(); }
void ScrollView::addChild(Widget*) { }
void ScrollView::removeChild(Widget*) { }
void ScrollView::scrollPointRecursively(int x, int y) { }
bool ScrollView::inWindow() const { return true; }
void ScrollView::wheelEvent(PlatformWheelEvent&) { }
void ScrollView::updateScrollbars() { }
int ScrollView::updateScrollInfo(short type, int current, int max, int pageSize) { return 0; }
IntPoint ScrollView::windowToContents(const IntPoint& point) const { return point; }
IntPoint ScrollView::contentsToWindow(const IntPoint& point) const { return point; }
PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent) { return 0; }
PlatformScrollbar::PlatformScrollbar(ScrollbarClient* client, ScrollbarOrientation orientation, ScrollbarControlSize controlSize) : Scrollbar(client, orientation, controlSize) { notImplementedGdk(); }
PlatformScrollbar::~PlatformScrollbar() { notImplementedGdk(); }
int PlatformScrollbar::width() const { return 15; }
......
2007-03-04 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
Reviewed by Nikolas Zimmermann.
Load a url given on a command line in a way that also
works for local (file://) urls.
* GdkLauncher/main.cpp:
(main):
2007-03-02 Geoffrey Garen <ggaren@apple.com>
Tweaked parse-malloc-history to work with new malloc_history output format.
......
......@@ -162,7 +162,7 @@ int main(int argc, char* argv[])
frameView->ScrollView::setDrawable(frameWindow->window);
printf("OPENING URL == %s \n", url);
gFrame->loader()->load(url, 0);
gFrame->loader()->load(ResourceRequest(KURL(url)));
gtk_main();
#if 0 // FIXME: this crashes at the moment. needs to provide DragClient
delete page;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment