Merged r4342 - r4359 from 1_1 branch.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4383 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/win/vncviewer/CConn.h b/win/vncviewer/CConn.h
index 62b131e..d3b3b20 100644
--- a/win/vncviewer/CConn.h
+++ b/win/vncviewer/CConn.h
@@ -93,7 +93,7 @@
// DesktopWindow::Callback interface
void displayChanged();
- void paintCompleted();
+ void paintCompleted() {}
bool sysCommand(WPARAM wParam, LPARAM lParam);
void closeWindow();
void refreshMenu(bool enableSysCommands);
@@ -101,7 +101,7 @@
// CConnection interface
void setColourMapEntries(int firstColour, int nColours, rdr::U16* rgbs);
void bell();
- void framebufferUpdateStart() {}
+ void framebufferUpdateStart();
void framebufferUpdateEnd();
void setDesktopSize(int w, int h);
void setExtendedDesktopSize(int reason, int result, int w, int h,
@@ -152,6 +152,7 @@
bool reverseConnection;
bool requestUpdate;
bool firstUpdate;
+ bool pendingUpdate;
// Debugging/logging
std::list<Rect> debugRects;